projects / gpsbabel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e67f525 916bfd8)
Merge commit 'upstream/1.3.5'
authorJohn Goerzen <jgoerzen@complete.org>
Wed, 16 Jul 2008 18:04:03 +0000 (13:04 -0500)
committerJohn Goerzen <jgoerzen@complete.org>
Wed, 16 Jul 2008 18:04:03 +0000 (13:04 -0500)
Conflicts:

.hgtags

1  2 
Makefile.in patch | diff1 | diff2 | blob | history

diff --cc Makefile.in
Simple merge
Unnamed repository; edit this file 'description' to name the repository.